From 6680e51038f158001cdf189d8c1900a21afac86f Mon Sep 17 00:00:00 2001 From: "kaf24@scramble.cl.cam.ac.uk" Date: Tue, 6 Jul 2004 16:04:47 +0000 Subject: [PATCH] bitkeeper revision 1.1041.5.11 (40eacd9fZF8vOabxL_0gJXpgUypPQw) Fix free_irq() calls to pass the correct dev_id. --- .../arch/xen/drivers/blkif/backend/common.h | 4 ++-- .../arch/xen/drivers/blkif/backend/interface.c | 2 +- .../arch/xen/drivers/blkif/frontend/main.c | 2 +- .../arch/xen/drivers/netif/backend/interface.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/linux-2.4.26-xen-sparse/arch/xen/drivers/blkif/backend/common.h b/linux-2.4.26-xen-sparse/arch/xen/drivers/blkif/backend/common.h index daf09a76f9..98986cffb8 100644 --- a/linux-2.4.26-xen-sparse/arch/xen/drivers/blkif/backend/common.h +++ b/linux-2.4.26-xen-sparse/arch/xen/drivers/blkif/backend/common.h @@ -15,11 +15,11 @@ #include #include "../blkif.h" -#if 0 +#if 1 #define ASSERT(_p) \ if ( !(_p) ) { printk("Assertion '%s' failed, line %d, file %s", #_p , \ __LINE__, __FILE__); *(int*)0=0; } -#define DPRINTK(_f, _a...) printk("(file=%s, line=%d) " _f, \ +#define DPRINTK(_f, _a...) printk(KERN_ALERT "(file=%s, line=%d) " _f, \ __FILE__ , __LINE__ , ## _a ) #else #define ASSERT(_p) ((void)0) diff --git a/linux-2.4.26-xen-sparse/arch/xen/drivers/blkif/backend/interface.c b/linux-2.4.26-xen-sparse/arch/xen/drivers/blkif/backend/interface.c index 780d793c6c..16b37164ab 100644 --- a/linux-2.4.26-xen-sparse/arch/xen/drivers/blkif/backend/interface.c +++ b/linux-2.4.26-xen-sparse/arch/xen/drivers/blkif/backend/interface.c @@ -217,7 +217,7 @@ int blkif_disconnect(blkif_be_disconnect_t *disconnect, u8 rsp_id) blkif->status = DISCONNECTING; blkif->disconnect_rspid = rsp_id; wmb(); /* Let other CPUs see the status change. */ - free_irq(blkif->irq, NULL); + free_irq(blkif->irq, blkif); blkif_deschedule(blkif); blkif_put(blkif); } diff --git a/linux-2.4.26-xen-sparse/arch/xen/drivers/blkif/frontend/main.c b/linux-2.4.26-xen-sparse/arch/xen/drivers/blkif/frontend/main.c index fa662496ec..1216600eff 100644 --- a/linux-2.4.26-xen-sparse/arch/xen/drivers/blkif/frontend/main.c +++ b/linux-2.4.26-xen-sparse/arch/xen/drivers/blkif/frontend/main.c @@ -616,7 +616,7 @@ static void blkif_status_change(blkif_fe_interface_status_changed_t *status) printk(KERN_INFO "VBD driver recovery in progress\n"); - /* Prevent new requests being issued until we've fixed things up. */ + /* Prevent new requests being issued until we fix things up. */ spin_lock_irq(&io_request_lock); recovery = 1; blkif_state = BLKIF_STATE_DISCONNECTED; diff --git a/linux-2.4.26-xen-sparse/arch/xen/drivers/netif/backend/interface.c b/linux-2.4.26-xen-sparse/arch/xen/drivers/netif/backend/interface.c index 2c4b74e1ea..ff3bc7bbf7 100644 --- a/linux-2.4.26-xen-sparse/arch/xen/drivers/netif/backend/interface.c +++ b/linux-2.4.26-xen-sparse/arch/xen/drivers/netif/backend/interface.c @@ -266,7 +266,7 @@ int netif_disconnect(netif_be_disconnect_t *disconnect, u8 rsp_id) netif->disconnect_rspid = rsp_id; wmb(); /* Let other CPUs see the status change. */ netif_stop_queue(netif->dev); - free_irq(netif->irq, NULL); + free_irq(netif->irq, netif); netif_deschedule(netif); netif_put(netif); } -- 2.30.2